Merge version 5.4.0-1+rpi1 and 5.4.0-2 to produce 5.4.0-2+rpi1

diff --cc debian/changelog
index 1eea1d51aa53e78cb58ace725c7469d98b686828,9d7c99f25e2d87bd8f948efe6268769a647173c3..ad1a1ba444c2d86751da7c463c7c695eecd44cb1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,9 +1,23 @@@
- ocaml (5.4.0-1+rpi1) forky-staging; urgency=medium
++ocaml (5.4.0-2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 4.08.1-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 26 Nov 2019 19:38:59 +0000]
 +  * Revert previous raspbian changes, changing the triplet 
 +    now seems to cause more problems than it solves (specifically
 +    it causes ocaml to try and use nonexistant compilers).
 +  * Edit configure.ac to select armv6 when using "arm-linux-gnueabihf"
 +  * Partially fix clean target.
 +
 +  [changes introduced in 4.08.1-5+rpi1 by Peter Michael Green]
 +  * Remove gitattributes that cause problems for dgit.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 13 Jan 2026 18:32:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 15 Jan 2026 04:00:17 +0000
++
+ ocaml (5.4.0-2) unstable; urgency=medium
+ 
+   * Increase the amount of data written to a pipe in a test
+     (Closes: #1107773)
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Fri, 09 Jan 2026 08:54:31 +0100
  
  ocaml (5.4.0-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 874715492aabc0a1ed9f6360ffb973e0b6d8d703,6da62215d11e3ea7abdd06bbcf7f2ab9483fd4b7..e1a7c8cd759aa98f01c30f998a25b946b0a1df6c
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -3,5 -3,4 +3,6 @@@ Trigger-output-complete-exe-on-custom-w
  Do-not-error-on-warnings-in-autoconf.patch
  Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
  Mark-test_compact_manydomains-as-multicore.patch
+ Increase-the-amount-of-data-written-to-a-pipe-in-a-test.patch
 +use-armv6-for-raspbian.patch
 +remove-gitattributes-that-cause-problems.patch